wayland: Make gdk_display_get_name work

It should just return the same as gdk_screen_make_display_name.

diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
index 8f6a398c031bc9392c9bdbdf439d815e0459875c..7b54c7749d8ac3ea293a2389f01cf3e0edeced8a 100644 (file)
--- a/gdk/wayland/gdkdisplay-wayland.c
+++ b/gdk/wayland/gdkdisplay-wayland.c
@@ -606,7 +606,13 @@ gdk_wayland_display_finalize (GObject *object)
 static const gchar *
 gdk_wayland_display_get_name (GdkDisplay *display)
 {
-  return "Wayland";
+  const gchar *name;
+
+  name = g_getenv ("WAYLAND_DISPLAY");
+  if (name == NULL)
+    name = "wayland-0";
+
+  return name;
 }
 
 static GdkScreen *

diff --git a/gdk/wayland/gdkscreen-wayland.c b/gdk/wayland/gdkscreen-wayland.c
index ff2ab1910ccb94c6d1f578c1e68cd19853622a0a..c72c155c6eb88e227d72bb64da8aae0007e97c12 100644 (file)
--- a/gdk/wayland/gdkscreen-wayland.c
+++ b/gdk/wayland/gdkscreen-wayland.c
@@ -171,13 +171,7 @@ gdk_wayland_screen_is_composited (GdkScreen *screen)
 static gchar *
 gdk_wayland_screen_make_display_name (GdkScreen *screen)
 {
-  const gchar *name;
-
-  name = g_getenv ("WAYLAND_DISPLAY");
-  if (name == NULL)
-    name = "wayland-0";
-
-  return g_strdup (name);
+  return g_strdup (gdk_display_get_name (GDK_WAYLAND_SCREEN (screen)->display));
 }
 
 static GdkWindow *